Sdk 331 account management should be moved to instruments #246

Nagaprasadvr · 2023-09-25T03:26:04Z

Added few more methods to LegInstrument Insterface like getBaseAssetMints, getOracleAccounts etc
cleaned up and removed helper functions associated with rfq legs

…he-options' of https://github.com/convergence-rfq/convergence-sdk into sdk-331-account-management-should-be-moved-to-instruments

into sdk-331-account-management-should-be-moved-to-instruments

changeset-bot · 2023-09-25T03:26:07Z

⚠️ No Changeset found

Latest commit: 2b58be9

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

linear · 2023-09-25T03:26:08Z

SDK-331 Account management should be moved to instruments

these clog up handlers. Should add these to instrument. Should not construct accounts directly in operations

codeclimate · 2023-09-25T03:26:38Z

packages/js/src/plugins/rfqModule/operations/createRfq.ts

+      const optionMarketTxBuilder =
+        TransactionBuilder.make().setFeePayer(payer);
+      if (optionMarketIxs.length > 0) {
+        optionMarketIxs.forEach((ix) => {


Similar blocks of code found in 2 locations. Consider refactoring.

codeclimate · 2023-09-25T03:26:38Z

packages/js/src/plugins/rfqModule/operations/createAndFinalizeRfqConstruction.ts

+        if (optionMarketIxs.length === 0) continue;
+        const optionMarketTxBuilder =
+          TransactionBuilder.make().setFeePayer(payer);
+        optionMarketIxs.forEach((ix) => {


Similar blocks of code found in 2 locations. Consider refactoring.

codeclimate · 2023-09-25T03:26:38Z

packages/js/src/plugins/rpcModule/RpcClient.ts

+    }
+    const flattendedTransactions = transactionMatrix.flat();
+    const { keypairs, identities } = getSignerHistogram(signers);
+    for (let transaction of flattendedTransactions) {


Similar blocks of code found in 2 locations. Consider refactoring.

codeclimate · 2023-09-25T03:26:38Z

packages/js/src/plugins/psyoptionsAmericanInstrumentModule/instrument.ts

+    );
+    return optionMarketIxs;
+  }
+  getBaseAssetAccount(): AccountMeta {


Similar blocks of code found in 3 locations. Consider refactoring.

codeclimate · 2023-09-25T03:26:38Z

packages/js/src/plugins/spotInstrumentModule/instruments.ts

+  async getPreparationsBeforeRfqCreation(): Promise<CreateOptionInstrumentsResult> {
+    return [];
+  }
+  getBaseAssetAccount(): AccountMeta {


Similar blocks of code found in 3 locations. Consider refactoring.

…he-options' of https://github.com/convergence-rfq/convergence-sdk into sdk-331-account-management-should-be-moved-to-instruments

codeclimate · 2023-09-25T03:47:29Z

packages/js/src/plugins/psyoptionsEuropeanInstrumentModule/instrument.ts

+    };
+  }
+
+  getBaseAssetAccount(): AccountMeta {


Similar blocks of code found in 3 locations. Consider refactoring.

codeclimate · 2023-09-25T03:47:30Z

packages/js/src/plugins/psyoptionsAmericanInstrumentModule/instrument.ts

  getDecimals = () => PsyoptionsAmericanInstrument.decimals;
  getSide = () => this.side;
+  toLeg(): Leg {


Similar blocks of code found in 3 locations. Consider refactoring.

codeclimate · 2023-09-25T03:47:30Z

packages/js/src/plugins/spotInstrumentModule/instruments.ts

+    };
+    return oracleAccount;
+  }
+  toLeg(): Leg {


Similar blocks of code found in 3 locations. Consider refactoring.

codeclimate · 2023-09-25T03:47:30Z

packages/js/src/plugins/psyoptionsEuropeanInstrumentModule/instrument.ts

+
+    return optionMarketIxs;
+  }
+  toLeg(): Leg {


Similar blocks of code found in 3 locations. Consider refactoring.

codeclimate · 2023-09-25T03:47:30Z

packages/js/src/plugins/rfqModule/operations/createRfq.ts

+      .map((ins) => ins.getValidationAccounts())
+      .flat();
+    baseAssetAccounts = instrumentsToAdd.map((i) => i.getBaseAssetAccount());
+    rfqBuilder = TransactionBuilder.make()


Similar blocks of code found in 2 locations. Consider refactoring.

codeclimate · 2023-09-25T03:49:06Z

packages/js/src/plugins/rfqModule/operations/createRfq.ts


-  return TransactionBuilder.make()
+  let rfqBuilder = TransactionBuilder.make()


Similar blocks of code found in 2 locations. Consider refactoring.

codeclimate · 2023-09-25T03:49:06Z

packages/js/src/plugins/psyoptionsAmericanInstrumentModule/instrument.ts

+    return this.underlyingAssetMint;
+  }
+
+  async getOracleAccount(): Promise<AccountMeta> {


Similar blocks of code found in 3 locations. Consider refactoring.

codeclimate · 2023-09-25T03:49:06Z

packages/js/src/plugins/spotInstrumentModule/instruments.ts

+    return this.mintAddress;
+  }
+
+  async getOracleAccount(): Promise<AccountMeta> {


Similar blocks of code found in 3 locations. Consider refactoring.

codeclimate · 2023-09-25T03:49:06Z

packages/js/src/plugins/psyoptionsEuropeanInstrumentModule/instrument.ts

+    return this.underlyingAssetMint;
+  }
+
+  async getOracleAccount(): Promise<AccountMeta> {


Similar blocks of code found in 3 locations. Consider refactoring.

codeclimate · 2023-09-25T03:49:07Z

packages/js/src/plugins/psyoptionsAmericanInstrumentModule/instrument.ts

@@ -254,3 +368,157 @@ export const createAmericanProgram = (

  return americanProgram;
 };
+
+export const getPsyAmericanMarketIxs = async (


Function getPsyAmericanMarketIxs has 44 lines of code (exceeds 25 allowed). Consider refactoring.

codeclimate · 2023-09-25T03:57:53Z

packages/js/src/plugins/psyoptionsEuropeanInstrumentModule/instrument.ts

@@ -1,4 +1,8 @@
-import { PublicKey, TransactionInstruction } from '@solana/web3.js';
+import {


File instrument.ts has 447 lines of code (exceeds 250 allowed). Consider refactoring.

codeclimate · 2023-09-25T03:57:53Z

packages/js/src/plugins/psyoptionsAmericanInstrumentModule/instrument.ts

@@ -1,4 +1,9 @@
-import { Keypair, PublicKey, TransactionInstruction } from '@solana/web3.js';
+import {


File instrument.ts has 473 lines of code (exceeds 250 allowed). Consider refactoring.

codeclimate · 2023-09-25T03:57:54Z

Code Climate has analyzed commit 4383e1c and detected 31 issues on this pull request.

Here's the issue category breakdown:

Category	Count
Complexity	12
Duplication	19

View more on Code Climate.

…he-options' of https://github.com/convergence-rfq/convergence-sdk into sdk-331-account-management-should-be-moved-to-instruments

EquilateralDelta · 2023-09-26T09:27:11Z

packages/js/src/plugins/instrumentModule/methods.ts

-    instrumentDecimals: legInstrument.getDecimals(),
-    side: toSolitaLegSide(legInstrument.getSide()),
-  };
-}


Why to move this logic to the instrument interface? The logic in each instrument is the same and is a clone of this logic

EquilateralDelta · 2023-09-26T09:28:49Z

packages/js/src/plugins/instrumentModule/types.ts

  getValidationAccounts(): AccountMeta[];
  getPreparationsBeforeRfqCreation(): Promise<CreateOptionInstrumentsResult>;
+  getUnderlyingBaseAssetMint(): PublicKey;
+  toLeg(): Leg;


A lot of those method are option-specific, but not generic. For example, they can be confusing when applied to spot instrument, rename getUnderlyingBaseAssetMint

Nagaprasadvr added 8 commits September 20, 2023 12:43

add few methods to LegInstruments interface

ac27352

Merge branch 'sdk-366-create-option-markets-and-ata-in-createrfq-if-t…

d196d8c

…he-options' of https://github.com/convergence-rfq/convergence-sdk into sdk-331-account-management-should-be-moved-to-instruments

new changes

96a5c5e

modify removeDuplicateAccountMetas

d369a61

pull create market logic branch

0a26c64

few refactoring

007cf27

Merge branch 'dev' of https://github.com/convergence-rfq/convergence-sdk

f8f7475

into sdk-331-account-management-should-be-moved-to-instruments

tests passing

3407b44

codeclimate bot reviewed Sep 25, 2023

View reviewed changes

Nagaprasadvr added 2 commits September 25, 2023 09:12

cleanup

9e75249

Merge branch 'sdk-366-create-option-markets-and-ata-in-createrfq-if-t…

4c363cd

…he-options' of https://github.com/convergence-rfq/convergence-sdk into sdk-331-account-management-should-be-moved-to-instruments

codeclimate bot reviewed Sep 25, 2023

View reviewed changes

Nagaprasadvr changed the base branch from dev to sdk-366-create-option-markets-and-ata-in-createrfq-if-the-options September 25, 2023 03:50

Nagaprasadvr changed the base branch from sdk-366-create-option-markets-and-ata-in-createrfq-if-the-options to dev September 25, 2023 03:52

fix build errors

4383e1c

Nagaprasadvr changed the base branch from dev to sdk-366-create-option-markets-and-ata-in-createrfq-if-the-options September 25, 2023 03:57

codeclimate bot reviewed Sep 25, 2023

View reviewed changes

Nagaprasadvr added 4 commits September 25, 2023 09:28

Merge branch 'sdk-366-create-option-markets-and-ata-in-createrfq-if-t…

a8a7e0b

…he-options' of https://github.com/convergence-rfq/convergence-sdk into sdk-331-account-management-should-be-moved-to-instruments

optimise code

8c9ab30

remove unnecessary await in fetching baseAssetAccount

58924b1

remove redundant methods

f187994

Nagaprasadvr requested review from pindaroso and EquilateralDelta September 25, 2023 13:26

EquilateralDelta suggested changes Sep 26, 2023

View reviewed changes

Nagaprasadvr added 2 commits September 27, 2023 11:55

pull upstream

a11d32b

remove pr comments

4032b90

Nagaprasadvr added 2 commits September 27, 2023 13:12

change baseAssetMint to exchangeAssetMint

b5c7ebf

make parseLeg sync

2b58be9

pindaroso closed this Feb 26, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Sdk 331 account management should be moved to instruments #246

Sdk 331 account management should be moved to instruments #246

Nagaprasadvr commented Sep 25, 2023

changeset-bot bot commented Sep 25, 2023 •

edited

Loading

linear bot commented Sep 25, 2023

codeclimate bot Sep 25, 2023

codeclimate bot Sep 25, 2023

codeclimate bot Sep 25, 2023

codeclimate bot Sep 25, 2023

codeclimate bot Sep 25, 2023

codeclimate bot Sep 25, 2023

codeclimate bot Sep 25, 2023

codeclimate bot Sep 25, 2023

codeclimate bot Sep 25, 2023

codeclimate bot Sep 25, 2023

codeclimate bot Sep 25, 2023

codeclimate bot Sep 25, 2023

codeclimate bot Sep 25, 2023

codeclimate bot Sep 25, 2023

codeclimate bot Sep 25, 2023

codeclimate bot Sep 25, 2023

codeclimate bot Sep 25, 2023

codeclimate bot commented Sep 25, 2023

EquilateralDelta Sep 26, 2023

EquilateralDelta Sep 26, 2023 •

edited by Nagaprasadvr

Loading


		return TransactionBuilder.make()
		let rfqBuilder = TransactionBuilder.make()

		@@ -1,4 +1,8 @@
		import { PublicKey, TransactionInstruction } from '@solana/web3.js';
		import {

		@@ -1,4 +1,9 @@
		import { Keypair, PublicKey, TransactionInstruction } from '@solana/web3.js';
		import {

Sdk 331 account management should be moved to instruments #246

Sdk 331 account management should be moved to instruments #246

Conversation

Nagaprasadvr commented Sep 25, 2023

changeset-bot bot commented Sep 25, 2023 • edited Loading

⚠️ No Changeset found

linear bot commented Sep 25, 2023

codeclimate bot Sep 25, 2023

Choose a reason for hiding this comment

codeclimate bot Sep 25, 2023

Choose a reason for hiding this comment

codeclimate bot Sep 25, 2023

Choose a reason for hiding this comment

codeclimate bot Sep 25, 2023

Choose a reason for hiding this comment

codeclimate bot Sep 25, 2023

Choose a reason for hiding this comment

codeclimate bot Sep 25, 2023

Choose a reason for hiding this comment

codeclimate bot Sep 25, 2023

Choose a reason for hiding this comment

codeclimate bot Sep 25, 2023

Choose a reason for hiding this comment

codeclimate bot Sep 25, 2023

Choose a reason for hiding this comment

codeclimate bot Sep 25, 2023

Choose a reason for hiding this comment

codeclimate bot Sep 25, 2023

Choose a reason for hiding this comment

codeclimate bot Sep 25, 2023

Choose a reason for hiding this comment

codeclimate bot Sep 25, 2023

Choose a reason for hiding this comment

codeclimate bot Sep 25, 2023

Choose a reason for hiding this comment

codeclimate bot Sep 25, 2023

Choose a reason for hiding this comment

codeclimate bot Sep 25, 2023

Choose a reason for hiding this comment

codeclimate bot Sep 25, 2023

Choose a reason for hiding this comment

codeclimate bot commented Sep 25, 2023

EquilateralDelta Sep 26, 2023

Choose a reason for hiding this comment

EquilateralDelta Sep 26, 2023 • edited by Nagaprasadvr Loading

Choose a reason for hiding this comment

changeset-bot bot commented Sep 25, 2023 •

edited

Loading

EquilateralDelta Sep 26, 2023 •

edited by Nagaprasadvr

Loading